chore(deps): migrate to famedly-zitadel-rust-client v0.12 - #164
Open
nikzen wants to merge 4 commits into
Open
Conversation
Bump the Zitadel client from the legacy zitadel-rust-client v0.3 to
famedly-zitadel-rust-client v0.12 and migrate the e2e test suite off the
gRPC v1 API onto the v2 HTTP API, dropping the v1 dev-dependency feature
that carried the remaining security advisories.
Fix two error-handling regressions in src/zitadel.rs surfaced by running
the e2e suite against the v2 production code: the v2 client exposes
Zitadel error codes (V3-DKcYh, PHONE-so0wa, COMMAND-ieJ2e) as a source in
the error chain rather than in the top-level Display. Match against the
full chain via `{error:#}` to restore the "user already exists" update
path and the invalid-phone fallback in both import_user and update_user.
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
nikzen
changed the title
Co-authored-by: Cursor <cursoragent@cursor.com>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #164 +/- ##
==========================================
+ Coverage 91.37% 91.99% +0.61%
==========================================
Files 10 10
Lines 1600 1648 +48
==========================================
+ Hits 1462 1516 +54
+ Misses 138 132 -6
... and 4 files with indirect coverage changes Continue to review full report in Codecov by Harness.
|
The pinned CI nightly denies these pedantic lints via `-D warnings`. - Extract import/delete/update arms of `sync_users` into helper functions. - Hoist test-local items (fixtures, helpers) to module scope, since the test macros emit statements before them, tripping items_after_statements. - Split the long install-ids/UKT test bodies into seeding helpers and add `#![cfg(test)]` to install-ids.rs so expect-in-tests is allowed. Co-authored-by: Cursor <cursoragent@cursor.com>
sirewix
reviewed
Jun 24, 2026
sirewix
left a comment
sirewix
left a comment
Contributor
There was a problem hiding this comment.
Looks ok on the surface, but there are so many changes in test code. If we want to verify everything it will take a lot of time
| uuid = { version = "1.10.0", features = ["v5"] } | ||
| wiremock = "0.6.2" | ||
| zitadel-rust-client = { git = "https://github.com/famedly/zitadel-rust-client", version = "0.3.0", default-features = false } | ||
| zitadel-rust-client = { git = "https://github.com/famedly/zitadel-rust-client", package = "famedly-zitadel-rust-client", version = "0.12", default-features = false } |
Contributor
There was a problem hiding this comment.
We should use the version from crates.io
|
|
||
| ### Miscellaneous Tasks | ||
|
|
||
| - *(deps)* Migrate to famedly-zitadel-rust-client v0.12 and drop the v1 feature, resolving the remaining security advisories |
Contributor
There was a problem hiding this comment.
It was only used in tests, so probably there was no real security issues
| // error code we match on below) as a source in the error chain, | ||
| // so we must inspect the full chain rather than just the | ||
| // top-level `Display`. | ||
| let error_chain = format!("{error:#}"); |
Contributor
There was a problem hiding this comment.
Suggested change
| let error_chain = format!("{error:#}"); | |
| let error_chain = format!("{error:?}"); |
| // error chain, so we match against the whole chain. | ||
| // If the new phone number is invalid | ||
| if error.to_string().contains("PHONE-so0wa") { | ||
| if format!("{error:#}").contains("PHONE-so0wa") { |
Contributor
There was a problem hiding this comment.
Suggested change
| if format!("{error:#}").contains("PHONE-so0wa") { | |
| if format!("{error:?}").contains("PHONE-so0wa") { |
| if let Err(error) = self.zitadel_client.remove_phone(zitadel_id).await { | ||
| // If the user didn't start out with a phone | ||
| if !error.to_string().contains("COMMAND-ieJ2e") { | ||
| if !format!("{error:#}").contains("COMMAND-ieJ2e") { |
Contributor
There was a problem hiding this comment.
Suggested change
| if !format!("{error:#}").contains("COMMAND-ieJ2e") { | |
| if !format!("{error:?}").contains("COMMAND-ieJ2e") { |
| @@ -1,5 +1,7 @@ | |||
| //! E2E tests for the id installation script | |||
|
|
|||
| #![cfg(test)] | |||
Contributor
There was a problem hiding this comment.
Suggested change
| #![cfg(test)] |
nikzen
changed the title
nikzen
force-pushed
the
chore/migrate-zitadel-rust-client-v0.12
branch
from
September 11, 2026 15:29
6c1a44a to
21fc327
Compare
nikzen
changed the title
nikzen
added this pull request to stack #167
September 11, 2026 15:39
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Migrates the Zitadel client dependency from famedly-zitadel-rust-client v0.3.0 to v0.12 (currently pinned to
0.12.2inCargo.lock), dropping the legacy v1 API feature. This resolves the remaining security advisories on the old dependency line.Client version status
Cargo.tomlrequiresversion = "0.12";Cargo.lockresolves to v0.12.2 (commit2feabec).reqwest_middleware-based client constructor, new update method,create_invite_code), but is intentionally not part of this migration.create_human_user,add_user_grant,set_user_metadata,search_user_grants,list_users,Token) are unchanged between v0.12.2 and v0.13.1; v0.13'screate_invite_codeis not yet adopted here — the follow-up fix (fix: Send first-login invitations to provisioned users (FP-295) #166) ships its own raw-HTTP invitation extension, which can migrate to the native method in a later dependency bump.What changed
(deps)Migrate to famedly-zitadel-rust-client v0.12, drop the v1 featureMerge notes
GitHub currently reports this PR as
CONFLICTING/DIRTYwithmain, but the conflicts are confined to version-marker lines:CHANGELOG.md— main gained the0.11.3entry; branch carries0.12.0on top of0.11.2Cargo.toml/Cargo.lock—version = "0.11.3"vs0.12.0and the dependency lines abovesrc/lib.rsauto-merges; the UKT no-users fix (#65c0759) and the newimport_source_userhelper touch disjoint regionsResolution direction: keep the branch's
0.12.0version and v0.12 dependency, keep main's0.11.3entry above0.12.0in the changelog (or reorder by date), take main's UKT change inCargo.lock.